Merge "Disable StrictMode policy when setting up profile support" into nyc-dev...
Merge "Disable StrictMode policy when setting up profile support" into nyc-dev am: 096e2dcf am: 3a61c96d
am: 64804b75
* commit '64804b75':
Disable StrictMode policy when setting up profile support
Change-Id: I239978da3183b412c01a98026a260daf50e6f84c