Merge "Add one method in OverrideApnTest." into pi-dev