Merge changes I2b8d8bc9,Iad2890b3
am: 65ee0f0865

Change-Id: I1d6697de3824076b0d0c9dcbaa7c8b4f6766d739