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

Change-Id: Ic2a012410d13daece6049836eb20f1109011a4a6