Merge "Merge "Fix PolicyListener testing surface." am: c5bc3bcd am: 3b1c79bd am: fb11991c" into sc-dev