Merge commit 'bf7dcd2a' into oc-dr1-dev-plus-aosp
am: 2b6bf9c26d

Change-Id: Icbc44391fc6a010c16ca31a1c0a1b690dd4bb8d9