Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d  -s ours am: 041f0dce8a  -s ours
am: 7891c6111a  -s ours

Change-Id: I21ed7b4ac16b487e3b5da87c48fdea526124be94