Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d849122b -s ours am: e7bdd367 -s ours am: 492069d4 -s ours Change-Id: I36933c0a24a9d79e628e00f6c5c3b0a8afad6c3a