Merge changes from topic "deprecate-iis-closed" am: bba51fede5 am: 9cb60599e4 am: 0001cb000a
am: 450dce9749

Change-Id: I7b98c3aefe9213c888dd6ae8ced39e9db9490057