Merge "Merge changes from topic 'am-0d5025fcdb3d4464bfbc38ce8dca75c8' into oc-dev-plus-aosp am: f8a0073e67" into oc-dr1-dev-plus-aosp
am: 308f3d3a8e

Change-Id: I760a817036046f5119e79d8a1afffe7fdc5a1974