Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae  -s ours
am: 799144a18b  -s ours

Change-Id: I01e221dcc0d669bc37882e5b15bfcd0c305725c5