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

Change-Id: I5ab7471088651c3dd11c48abc495c73e826a1f5b