Merge "When profiles are requested, also generate then for non-prebuild."
am: f92e179efd

Change-Id: Iaa65a160e681af975887b6c6432bf569051bd1b7