Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 495542837c  -s ours
am: 293322635c  -s ours

Change-Id: I9f01df2ba8ffb458d56b991719a40ad5cb9f9f39