Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 767d02158e  -s ours
am: babf652e62  -s ours

Change-Id: Id3d4b5975af01667887dbbf855638aa076cd0a5c