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

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