Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 94744459d2  -s ours
am: 03cde9c50a  -s ours

Change-Id: Ib4202d8ea0d8d213ef88fbc0e58da35258d959dc