Merge "Remain compatible with 4.1 handover-over-SNEP devices." into jb-mr2-dev