Merge changes I0ad349f2,I0f528cf1
am: 27a091d4a1

Change-Id: Ifac25d45d429da636dbcac608b865163effffc93