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

Change-Id: I9f25f6546aa463c6d4894953d0706bfbd6a435c6