[automerger skipped] Merge "Provide QSFactory" into rvc-dev am: bc67fc79cb -s ours

am skip reason: Change-Id I3b676e6fc2ec3f3b779c13b7dc8214569cc427e5 with SHA-1 4e3dddce35 is in history

Change-Id: Ia8526dcf8fa95de70cb3782d511016ab798bedc2