Merge "Check bluetooth app id instead of uid" into oc-dev