Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d97f049315  -s ours
am: a4fc5f2b76  -s ours

Change-Id: I32213fc43c9f653b35ee856d72284158a5ae8d1a