Merge "Fix broken DUN evaluation logic"
am: b0daeeb879

Change-Id: Iae7450ef21485c5a13f45fab570bf658b2da8f28