Merge changes I2ddfef0c,I49bee0c9
am: ca046e898b

Change-Id: I54b43a6fe240d00d0e530a8777bdb9f452a2b539