Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57bd22ffc1  -s ours
am: 347f2b60b5  -s ours

Change-Id: Icb948efc3c0408f44a01c16043c80cec307d4f55