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

Change-Id: Id496ee296b925e713bc50e673a0a5963d5ccedeb