Merge "Revert "Don't use profiles with vm safe mode"" am: 60e97a4bd4 am: 6636101423
am: 4f7537f6da

Change-Id: I38d24d7b44f443f184f954b231733dcf07b15913