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

Change-Id: I4cbde56de0e86e7dc1f97595a60a2d38de078bc7