Bug: 148878042 Merged-In: Ib6b5679f22901d2d9e7996e25b19318cc1916460 Change-Id: Ib8d508dd51391958ac12cc5b67a46c89f6703bf3