Merge changes I80af5f4b,I2fd0034e
am: 2decb2fc3a

Change-Id: I192bf6f4f5798f7c84c2d91517e3800dc428c0a5