Merge \"Fix AM.revokeUriPermissionFromOwner for prefix mode.\" into nyc-mr1-dev
am: 0217d4e6b8

Change-Id: I90c33ff1d5d24f2cd5e578d98193ee900eff6cc1