Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 880e823e9e  -s ours am: 6d2c9c29dc  -s ours
am: a04130fc66  -s ours

Change-Id: I54f6c25c921fc6567f3ec574b8c3c184f82859df