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

Change-Id: I1c6228d4ede0d62e7388b4223a62aca8d5c07321