Merge "Merge "Fix PolicyListener testing surface." am: c5bc3bcd8f am: 3b1c79bdc9 am: fb11991c1e" into sc-dev