Merge \"add system status checks between module execution\" into nyc-dev
am: c91fa06443

Change-Id: I6906d79232a3bdbfa9f28be33f55fa48c2d8d70b