Merge "Remove QS details prototype code" into rvc-dev am: 16715e7f85

Change-Id: Ib4c1cd617ba5b8a9ac00faead08eb57e5a9731f6