Merge "Import translations. DO NOT MERGE am: 2317faf4d9  -s ours am: 2787b2d5df  -s ours" into nyc-mr1-dev-plus-aosp
am: 879a0a877e  -s ours

* commit '879a0a877ec340aac82c058956b14d8ad08a9ef8':

Change-Id: Icef9bd3eb0dcc7c3957e96fe2b6a5abf31ce176c