synced with AOSPA

Change-Id: Ib45a4ac978d15b194273a5ab005728b324ee1737