Merge "Fix ALOGE_IF log in bufferhubqueue" into oc-dr1-dev