Merge "Fix ALOGE_IF log in bufferhubqueue" into oc-dr1-dev am: c3e0cdb28a
am: 05a8133967

Change-Id: I8fec5db7cc3248c8142f08f9fd896d6bd16dd5b2