This reverts commit d7554f39. Reason for revert: May have caused phone_max regression BUG:143316720 Change-Id: I592acd7f9f47ee2be06508236927a77b11185ace