Merge "Import translations. DO NOT MERGE" into oc-dev am: b6b811470b  -s ours
am: 7d279e839b  -s ours

Change-Id: I77390b01cbb3850e6477c14c37a8698906c3b08c