Merge "Initial import from upstream-master am: 18f09e4dd4 am: 332a30e181 am: 2547dd4e2f" into rvc-qpr-dev-plus-aosp