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

Change-Id: I99f7800bccdd03503185c593f86c1daab328c7f5