Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6e5a4b9384  -s ours
am: a3a808ff47  -s ours

Change-Id: Iecc18e35bfb647dfa9cd6319b8826cf4cefadbbe