Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: fab6fa3164  -s ours
am: 8d7b081cda  -s ours

Change-Id: I308208840e7ea8c01c9b05da68a546681c98598a