[automerger skipped] Merge "[CS] Support "instant failure" from factories" am: dce527fbd6 am: 821d197ce6
am:cd78f5f821-s ours am skip reason: change_id I9bce0f4d85fa8cad7f8a9998819f945b778c5ac5 with SHA14ad1b9f839is in history Change-Id: I8f82d119a7a940b190fecd665e47076404d47fd8
This commit is contained in: