Merge changes from topic 'am-bfe09c8870b04be684c9e4b6fd6ec81d' into oc-dr1-dev-plus-aosp
am: 6c6b69ae90

Change-Id: I6fd75ca717a7fdb8f79b508588aca09497c11cfd