Merge "Don't use profiles with vm safe mode" into nyc-mr1-dev am: cf6e673296
am: 98051e00c8

Change-Id: Id8232d97b5b835c52c752998304387de5c355782