Merge "Merge "Remove unused strings." into rvc-dev am: 124f3e88 am: 32c47c31" into rvc-d1-dev-plus-aosp am: b08c5b72 am: 87973bb5 Change-Id: I3ef224cce21fc511988ded919fa2c9cecf14ab79