Merge "Import translations. DO NOT MERGE am: ba35e1f170  -s ours am: 0a9cb7a9d0  -s ours" into nyc-mr1-dev-plus-aosp
am: 020533189e  -s ours

* commit '020533189e383dc23dc90b83c8ef073271174383':

Change-Id: I86c5eb015a94379f073779031ac78ff585535176