Merge "Only enforce profile size limits on target builds" am: 469a27f535 am: d95ee487b6 am: 66d21fac43
am: 4ebf7feb98

Change-Id: I6c5e87afe258bad4a9874e234ad3ed8681110c65