Merge "Import translations. DO NOT MERGE" into nyc-dev am: a68d1f10e2  -s ours
am: abd7b12ada  -s ours

* commit 'abd7b12ada0f5f1c61ef9cec2ca13e199d6b2682':

Change-Id: I68b5d705a30392165854e9496352b12748c5942c