Merge "Import translations. DO NOT MERGE" into oc-dev am: d4c3c6e1b1  -s ours
am: ea87948cf9  -s ours

Change-Id: I6f2179a7f1228a883121c89ec6fc0d6c7dcd2c77