Merge changes from topic "am-8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp
am: 3a96381c69

Change-Id: Ie1fb2e5843f151447de728348a64eb0b5a8699b5