Merge "Merge "Controls Ui - More string adjustments" into rvc-dev am: 294823f0 am: 507d3227" into rvc-d1-dev-plus-aosp