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

Change-Id: I37165f937a36f6a96227733d7581a212befa2507