[automerger skipped] Merge "[CS] Support "instant failure" from factories" am: 6e6bca7632 am: da8e8e4be0
am:2224f6110b-s ours am skip reason: change_id I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5 with SHA12efc554d92is in history Change-Id: I8f82d119a7a940b190fecd665e47076404d47fd8
This commit is contained in: