Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 9da0a744c5  -s ours
am: a56ea23d9c  -s ours

Change-Id: I8f48b65f14d0edae0566b45bc49ed45680462de2