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

Change-Id: Ic5d68f8f2b79b31f0d06460d8300609a84607fc2