Merge "Import translations. DO NOT MERGE" into oc-dev am: 6b1ff7073a  -s ours am: 5386943cf2  -s ours
am: 16ec3c30e5  -s ours

Change-Id: I03cc46fad1b0c82b4ee4d6460f320c278a7fa250