Merge "Be less aggressive when inlining."
am: 3050956ebb

Change-Id: I324e8781ab65a632831d9531ce60eddbd5f8453d