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

Change-Id: Ib765a9aa0807ddd074b3ff4b066c8f79eb2751a8