am cb4d5475: am 413a04fb: Merge commit \'905dd107\' into merge

* commit 'cb4d5475e9f6078a209bc49161d7d1c641a11783':
  Tests to verify writing of Uri grants.