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

Change-Id: Iaf431883b44066af15b314a521bf72a5fb863039