This reverts commit e9f44933. Reason for revert: Bug: 185737105 Change-Id: I7978fb859451a47182bf7a2147a50254731bfc2d