Merge "Update deprecated pollscm usage"