Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff  -s ours
am: 4d681e127b  -s ours

Change-Id: Ibf37f62606eb31b3dadde411d91a501203a79b3f