Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 86875e592a  -s ours
am: fbe8eef154  -s ours

Change-Id: Ic8550bb43ae2e9eaf74e10d8d1976bbb39876176