Merge changes I1309d8df,Ib38ba82e
am: 5bf13d47ef

Change-Id: Ib10e027cb72d1697f91bdfbec4d1157291164619