Merge "[CS] Support "instant failure" from factories" am: eb3e7b3f64
am: 65d66eec82

Change-Id: I2dbee9b36a500ff1140c208997581064dd0b4ef1