Merge "Reverts files deleted incorrectly in ag/11570083. am: 9d2d90eaf6 am: c90e4c0110 am: daf71d8feb" into rvc-qpr-dev-plus-aosp