Merge "Import translations. DO NOT MERGE am: 4bf388ecbd
-s ours am: 9441334fce
-s ours am: 7910ade9dd
-s ours" into nyc-mr1-dev-plus-aosp
commit
e1fc7ec0ab