Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3ff12c2a -s ours am: 75fda68e -s ours am: d818f0ab -s ours Change-Id: If3fb0047ddad37f7c1b8b43e3044001d030c9e41