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

Change-Id: I560ca020942b2aca573f467307ef36dd77885d36