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

Change-Id: I58fccfb611d5010380c900d32249b24fd8763fc6