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

Change-Id: Ia1a6395ae26733028d1c3487332400c3000de2bb