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

Change-Id: Idbb294776a7400de5aebb99b9a45f7121c7415f6