Merge changes from topic "b/129002747" am: dddf40a7f5
am: 220fcf241a

Change-Id: Ia5bdbdb017c6490afdd9db7cf59a1c0f7f86bbbb