This matches what the UI folks asked us to use. Also fix the locale parsing code. Bug: http://b/27837319 Bug: http://b/22465983 Bug: http://b/26548285 Change-Id: I316a6e1f44855313dd983950abf21b543be7ffc0
Bug: http://b/27837319 (cherry picked from commit 3d0153a807) Change-Id: Iec2cd10fa77ed1881d55ac4e0ab48e45172f0cf7
3d0153a807