Merge \\"Teach persistable Uri grants about direct boot\\" into nyc-dev am: 7014eef54a
am: ca7e80f3c5

Change-Id: If35606374aee2185039d1ed28933689a0a46ae66