Merge "Merge "Revert string change" into oc-dr1-dev am: 4b8f2c9ad5 am: 698ce72bc2" into oc-mr1-dev-plus-aosp
am: 7808d07be0
Change-Id: Iaef740b035f9181313430e7e0dbc35691bb6200d
This commit is contained in: