Merge "Stop cascading failure from setup fail"
am: 9759c29e97

Change-Id: Ie523f842fb4fd0794b371a5eb80cc5c9012514fe