Merge "Merge "Requantize by resolution / 8" into rvc-dev am: 5e520a5a8e am: 34806cd84d am: 1be75a323f" into rvc-qpr-dev-plus-aosp