Merge "Merge "Remove unused strings." into rvc-dev am: 124f3e883c am: 32c47c3102" into rvc-d1-dev-plus-aosp am: b08c5b72f0 am: 87973bb551

Change-Id: I3ef224cce21fc511988ded919fa2c9cecf14ab79