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

Change-Id: I85b58c2db53fa98ae5d925396f0f8a104d8afba9