(cherry picked from AOSP commit 9edb1fc511) Change-Id: I18c44cd08dfb51e02a96d0b726e9af1db21e3058
9edb1fc511