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

Change-Id: I15d3c06c943030f376776bde70fd581575110b27