Merge "Import translations. DO NOT MERGE am: 495d4ce1 -s ours am: 120c3e98 -s ours" into oc-dr1-dev am: 70906280 -s ours Change-Id: If5ae8d80646e4b2c68516e1441bc3b856c204907