Merge "Import translations. DO NOT MERGE am: 1da3e64cfa
-s ours am: e6b4925ea5
-s ours am: 0b222e035e
-s ours am: 252d558ff6
-s ours" into nyc-mr1-dev-plus-aosp
am: beb8a63e8b
-s ours
Change-Id: I0e26fd716700b393ed1205342b9650f74800a463
main
commit
a3c592d869