Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd  -s ours
am: ffae7d82c3  -s ours

Change-Id: Iff1708277ff2827a631228d4c4a286e503543190