am 3d8e949a: am 9088c083: am 12b05ec2: am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev

* commit '3d8e949a7767b204eb9504d3c5267de9e0fd6899':
  Grant default permissions to the setup app robustly.