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

Change-Id: I125aaf91c35986fd1496aa2cf406cd22845c36aa