Merge "Merge "Sample region under secondary home handle" into rvc-dev am: aadbf05a am: aa4071bf" into rvc-d1-dev-plus-aosp