Merge changes I2b8d8bc9,Iad2890b3 am: 65ee0f0865
am: 9af5b85b6a

Change-Id: If7a2e8cce8f3b0a0a809b821414a6fa504bb55a0