Merge "Check the return value from allocateSecureBuffer" into oc-dev