Merge "[CS] Support "instant failure" from factories" am: dce527fbd6
am: 821d197ce6

Change-Id: I2dbee9b36a500ff1140c208997581064dd0b4ef1
tree: 724a88ff245c6c0bebf491222777d9ddda0fa1ea
  1. core/
  2. services/
  3. tests/