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

Change-Id: I6442efdc972861973d0330774b2f04503dc1c2e6