Merge "DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours am: 4a4b6bfafb am: 61e9179646  -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7  -s ours am: 65b0a6f596 am: 6f47221263 am: 47bfa0ab25 am: 6cfa84791d am: 87ae27b020" into nyc-mr2-dev-plus-aosp