Merge "Fixed ApnEditor crash issue" into pi-dev am: c670be956c
am: 755426d7d8

Change-Id: I575e6775a47a2cd8b8bff3e2ab55309744a72e0a