Merge "Fix NPE in streamin policy getters."