Merge changes from topic "deprecate-iis-closed"
am: bba51fede5

Change-Id: Ib9a9603093cd224fd1abe4b6c87cbaf1141eabc4