Merge "Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master am: 41d6995efa" into oc-dev-plus-aosp
am: 4c92af3155

Change-Id: I9825dcb653ac21ef0c7b8f2d93addfcbd30e879e