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

Change-Id: I643ac51ad7d162527ee4aa73da6568d94156083b