Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 197da1f978  -s ours

Change-Id: Ia680464b0a45ab4ec9be1521adf5d31063622cae