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

Change-Id: I9efc01a30981af94061ea906727a72779e052c14