Merge changes I30a83721,I1094f213
am: 85e391b2a2

Change-Id: Ieb1540a37541567b0763921d083d743d9fe30971