Merge "Merge "Remove unused strings." into rvc-dev am: 124f3e88 am: 32c47c31" into rvc-d1-dev-plus-aosp