Merge "Merge "Remove unnecessary lines am: a3bff77ab8 am: 5fe66b0de3" into rvc-d1-dev-plus-aosp am: 99d214b9d3" into rvc-qpr-dev-plus-aosp