Merge changes I544cf272,I792113ff,I16083e2d
am: 26642c40cd

Change-Id: I8fcd5b559a4e511af69a25a3ca89b51d3f6ec2b8