Merge changes from topic 'am-94906183e52945938953177851714b42' into oc-mr1-dev-plus-aosp
am: 9352ce7a7d

Change-Id: Iee74aaecac05dac15b2accff5d055210ff218e49