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

Change-Id: I9915e04242b5e404c53c810822b91e199c90df59