[automerger skipped] Merge "[CS] Support "instant failure" from factories" am: eb3e7b3f64 am: 65d66eec82
am: c3b48be493 -s ours
am skip reason: change_id I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5 with SHA1 ae574a8673 is in history

Change-Id: I8f82d119a7a940b190fecd665e47076404d47fd8