add explicit when_present checks for IE goodness

Change-Id: I19500f22cb1e16d74d5c4c38efd8b3e4f7c86a77
Merge "add explicit when_present checks for IE goodness"