Bring inline with AOSP

Change-Id: I4a3e9eb7096ded5906ad379d271b3935fcd14f4c