Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 99b590df3e  -s ours

Change-Id: If09ddaa056c14936d86b11a369a7a2a31025f057