Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac  -s ours am: 3b2c3fe5ef  -s ours
am: ea109fa2c7  -s ours

Change-Id: I0db2a437d7449ebb7791c10615c248e1640cc132