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