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
Change-Id: If913cec6881240926b3866eccd4f2680c96bc1f7
This commit is contained in: