Merge "Fix potential NPE from 326226"