Merge changes from topic "CherryPickMainline" am: cd70c935b3 am: 024080998d

Change-Id: I4c2d7b8573805119915572c33486e5fd2cdf915e