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

Change-Id: If88ea0b60f9f383195c5306476515e0126a3867a