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

Change-Id: Iff2573ed8d4115de8b1be6834595bc0ad902654a