Merge "Import translations. DO NOT MERGE" into oc-dev am: 5bb0b0b7e2  -s ours
am: 0f880e61bd  -s ours

Change-Id: I4567fc8c2ea0d36ae54da016936f38c9b614e3cb