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

Change-Id: I2a8761cd74641e4cbec312b34536de6f33b50a09