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

Change-Id: I28c0621afb77e4c2d6471b0390d4acf794f4d1ea