Merge "Fix broken DUN evaluation logic" am: b0daeeb879
am: dd76dd1eea

Change-Id: I7e194d1c17df7770706e3c80e587ce296f1e40f8