Merge "Import translations. DO NOT MERGE" into oc-dev am: 2e0a752fd7  -s ours
am: 9ec6cef05c  -s ours

Change-Id: Id35b1ef4a3ab1607a34298b71dd74eccd7e62f47