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

Change-Id: I4f895139fd39fec893c590d556e42bec881c6d34