Merge "Grant default permissions to the setup app robustly." into mnc-dev