Merge changes I04e48572,I2db1fc85
am: fc81a030a7

Change-Id: I4cef969c97f2c36215198818f0bcf7c24f40a5d3