Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4a19326  -s ours
am: 61f3f25  -s ours

* commit '61f3f251f67e08dc74bff118d958db51d5e44666':

Change-Id: I1455fde32713583deec2e69c1b4da90a41b42fbd