Merge changes I8c58d6bd,I0a19fd87 am: 291fd678e5 am: d461fd39fb am: 835ee906ab
am: 911a034a21

Change-Id: I45cc0a8d52fa241bb23b8da4f39b086c56abee5e