Merge "Import translations. DO NOT MERGE" into oc-dev am: 88e9aa19e2  -s ours
am: 91dcbe4bd9  -s ours

Change-Id: I9fb6e2699b3f737053741a2e26095241413dda76