Fix APN editing

Change-Id: I4ef525d4b91b2f9510c8d3c7d976013acb7c1ec8