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

Change-Id: Iab9783bfc462e5232df260f701c8f05e099bf55e