Merge changes from topic "b/67046543" am: 2e1e7bd962 am: 22f7401cd7
am: fa27ed1dd1

Change-Id: Ib6ebab51d67c82d2c93c3f4302e6c98b1ed623c1