Merge changes I6eb07d50,I15cc1568,I70b7132f
am: 3bca85a1e3

Change-Id: I2594675e73f681b74c560cdec3e01e266d871c0c