Merge branch 'shipping-and-cc' of ssh://github.com/securekey/openmidaas-android-lib into shipping-and-cc