Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 94744459d2  -s ours
am: 0a3392d146  -s ours

Change-Id: Ib11c73dcb6724ccd1f4ca5e7aecf8aaa43a662b0