Merge "Fix build am: aaef0983ba am: 2c410e0d5f" into oc-dr1-dev-plus-aosp
am: 44a70e99b0

Change-Id: Ibe06c7ec7cff574b5ffb03c73d13401644e9ff4f