Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: b2d152ee90  -s ours
am: 60752b1f1c  -s ours

Change-Id: I7152fdc9d662c2d660f12d111fbb0f466afc8ef3