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: 45f115afad  -s ours

Change-Id: Ia2e8ff2e7847ee2d130d680e750ed5ff2aebeb8c