Merge "Narrow concession to support legacy apps." into rvc-qpr-dev