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

Change-Id: Ie267cde37ae341607e1b97c0d6e4b61ca9ceefc3