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

Change-Id: I13577d905dc6c0e6d873e23663c4da01531b2267