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