Merge "Fix QS visibility logs missing some info" into oc-dev
am: df9b2e8d80

Change-Id: I0587ba086e5903549f629cf43755b57ec9d6952f