Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev