Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 3c868520fb  -s ours
am: 74d38cc39e  -s ours

Change-Id: If95bb3fcefec59d5b205d63d416c29772eacf4e3