Merge "Move to using a host side test for APN changes" into rvc-dev