Merge "Import translations. DO NOT MERGE" into oc-dev
am: 2d1fb47916  -s ours

Change-Id: Ie7184d013593bad3c8b70974917236fd1717bd6a