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