Merge changes I04e48572,I2db1fc85 am: fc81a030a7
am: ac185ba188

Change-Id: I5a6ca25dbf5d02c9513075ad70f216299a7559ce