Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d5d5dc2473  -s ours am: 7640ef24d1  -s ours
am: bc22328d27  -s ours

Change-Id: I821106a3a7f813c2dd6e917ca8a18f03664fa020