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

Change-Id: I0c5f2823763857edfc5095686345c764d9be12e1