Merge changes I026ed49e,I8685b1ae am: 11cf355c8d
am: 494b5a8067

Change-Id: Ib386c523b43b41618698bc8fb9f606c7d1cbb679