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

Change-Id: If76ba6cc7f39e92173fe9b236673eb49874f692d