[automerger skipped] Provide QSFactory am: 4e3dddce am: 01db3722 am:...
[automerger skipped] Provide QSFactory am: 4e3dddce am: 01db3722 am: 06787137 am: 47ff0c0d -s ours
am skip reason: Change-Id I3b676e6fc2ec3f3b779c13b7dc8214569cc427e5 with SHA-1 6fa10209 is in history
Change-Id: I40bc1c6d5aedec84ccb65388b78a3dd096bb588e