Merge "Disable StrictMode policy when setting up profile support" into nyc-dev