Merge "Import translations. DO NOT MERGE" into oc-dev am: 42f81ee464  -s ours
am: 8051830544  -s ours

Change-Id: Ib3f4055bd160c3860b922cc446a1e00ca9cc03f8