Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545  -s ours am: 611a6ffe29  -s ours
am: b663a08d66  -s ours

Change-Id: I170c03e11efefdead715035b4946b32176b6ba99