Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7  -s ours
am: 53f4db5612  -s ours

Change-Id: I74facd707fb3203105b66d6853052bef461e4419