Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 7e61e7c585  -s ours
am: fdb6ec0314  -s ours

Change-Id: Ie5eb63649ee976737b3287c19b4c8238e9eb84d7