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

Change-Id: I412a0b7446bb3851007df2b64e63dc14e8e5191e