Bring inline with AOSP

Change-Id: Id84c4079a7b138163f7a6c7b127a816bad31b31a