Merge changes I784c1dcc,Ic6a06cdc,I874b10c2 am: 389e950c37
am: d52c356ead

Change-Id: Iefb41072c40a0a7b839a1b10e1c581a8173fcc1f