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

Change-Id: I10c9f0b62cd75c16121ca898e4e0d844519b2d99