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

Change-Id: I705b1611b46285e4953c59e828336869cea616bb