- Work around bug in QS implementation - Bug: 15916487 Change-Id: I623a4e31e8b4187d920c2724182c927328885b3b