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

Change-Id: I0cbf79f18bb0edfb1b28220b7cc3f810e1682bb5