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

Change-Id: Id92fa9ff612c16f45cd20978b53f81adf85ef6f1