Merge "Fix issue that read-only apns can be edited" am: e871464053
am: 6b0237ebfb

Change-Id: Id45080ae655a90bbdc3bf1601bc4aff33c42de3e