Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125  -s ours" into nyc-mr2-dev am: cd955ca6e5  -s ours am: f66ddc099a  -s ours
am: b277fa8fb9  -s ours

Change-Id: I0a24e13600bea4b3b9cdba9d06b7cbb1386e0d4c