We need this part of the PA QS Commit...

Change-Id: I16bd8ba59fb7a3ea3c6802d05be3816dba01fb32