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

Change-Id: Ib9a469b16a598c47b615a15fc7cce420bfe4b8b7