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

Change-Id: I7e8bf84bfc3606e3dd5620a1b88cce3daa995a68