Merge changes I8eca5f24,I9d79c67c am: 54604d9143
am: 276672d192

Change-Id: I74e78d829a718d145fcf1ae06ac9491329544f51