Merge changes I6672c5b0,Ie053a5d8 am: da26bc7cff
am: f88aaa1ceb

Change-Id: I2b166d95a89faf7202c01f4fc1d9e95cca813353