Merge changes from topic 'b/36021111' into oc-dev
am: 69ab8e1d56

Change-Id: I4bf9b7425c86a8725e9d7c055ab4c4f389fe3a2b