[automerger skipped] Provide QSFactory am: 4e3dddce am: 01db3722 am:...
[automerger skipped] Provide QSFactory am: 4e3dddce am: 01db3722 am: 380af1f3 am: ec7dfede -s ours
am skip reason: Change-Id I3b676e6fc2ec3f3b779c13b7dc8214569cc427e5 with SHA-1 4e3dddce is in history
Change-Id: I5fbbb42f54cfc4590220159e06581b82888b9f2c