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

Change-Id: I4bc1a9553c4a3edd85bc87aefd7497b515a68f3f