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

Change-Id: Ie4eb3a673eb7e7b1f531a05e2b8a420516bccb4e