Merge "Only enforce profile size limits on target builds"
am: 469a27f535

Change-Id: I70972ae8728fbdc8ddf61604f7a8f65e44aa0b66