Merge "Fix NPE that was stopping VT updates to Dialer" into nyc-mr1-dev