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

Change-Id: Id38ad6e5444b3c3daf124375fe02183073343ce9