Merge "Import translations. DO NOT MERGE" into oc-dev am: 73614be4c5  -s ours
am: 988d19fa42  -s ours

Change-Id: I27b7d46cddb85314a1e1ec3bd19cb01a8912d996