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