Merge "Merge changes I20bdab1b,Id82f9081 into oc-dev am: 64b044680c am: 09a3325f41" into oc-dr1-dev-plus-aosp