Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e210bf7a40  -s ours
am: e47cc86d69  -s ours

Change-Id: Ia57216e086b55fcf91d31c1b9f075d50e65a61f4