Merge \"Disallow OobConfig being suspended\" into nyc-mr1-dev
am: ccdad8f85b

Change-Id: Ic072ddf8787b88c08f67af73550c50a867328930