[automerger skipped] Merge "Provide QSFactory" into rvc-dev am: bc67fc79 -s...
[automerger skipped] Merge "Provide QSFactory" into rvc-dev am: bc67fc79 -s ours am: 11b1fe0d -s ours
am skip reason: Change-Id I3b676e6fc2ec3f3b779c13b7dc8214569cc427e5 with SHA-1 4e3dddce is in history
Change-Id: Ie38be9ebfd699c129fb5135c383b3a6639703f48