Merge "Merge "Remove debug code before beta release." into rvc-dev am: c81dddfd am: c315e25e am: 5b1ac9a4" into rvc-qpr-dev-plus-aosp