Merge "Fixed localization formatting for picker widgets" into oc-support-26.1-dev
am: db9fe5ce77  -s ours

Change-Id: I099e9e5052eace16f0ae684c054a5a8e8501d090