Merge "Merge "Be super safe" into rvc-dev am: f664b6d0d9 am: 9ad149eb5a am: a50d493ba0" into rvc-qpr-dev-plus-aosp