Merge "Import translations. DO NOT MERGE" into oc-dev am: 9f7e653d56  -s ours
am: 8c9c497737  -s ours

Change-Id: I955759d1d429def8c4409fe083e256b2b68fd080