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

Change-Id: Iaa891dd77c5eaac49c66dcc87c38f8742af5f965