Merge changes from topic "b/63736262" am: 1f666a6be9
am: 6818f80dbb

Change-Id: Ibd9aaaab96fa60ee6f9d00baea0483a2cd328048