Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741 -s ours am: 4d00a951 -s ours am: 05913746 -s ours Change-Id: I58e641654abe46a6c3fcc53bf17138d341b8a393