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

Change-Id: I190d274fc232c548258f0016f80351e77bbe1e36