This reverts commit e1ab70ac. Reason for revert: b/18087431 Bug: 148087431 Change-Id: I03c7a0e42259b7b11cc31243a4ead0828a12ad10