Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c4bf1c3  -s ours
am: 873755a  -s ours

* commit '873755aaddf1ed85963d1aad14d66df81637c94a':
  Import translations. DO NOT MERGE

Change-Id: I28cba1092fa6c9c7553742fbc5011966dd8c3307