Merge "Initial import from upstream-master am: 18f09e4dd4 am: c559c751e9" into rvc-d1-dev-plus-aosp am: 1f5c0bd3ee

Change-Id: I1d4f4b01ae55799e0699225dc37290b69c5020b2