Merge changes from topic "b/140916230" am: 59942d7e52 am: e0cd965e7b
am: 385c9c3a67

Change-Id: I54c1ea2191128d6670fb6f02b241fcca44201058