Merge "DO NOT MERGE translate arrays in Settings/res"
am: 992a4e5500  -s ours

Change-Id: Ia5c69f39d1796acd79e453744cc7e5c487c43042