Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 95ad00d115  -s ours

Change-Id: Iba00061506c03e399378f2a74b03028c130bf0a1