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

Change-Id: I8c60234d38a9aedd6b2bec24ff053aa2049790bd