Merge "Be less aggressive when inlining." into oc-dev
am: ae80d305d9

Change-Id: I044f32409f5dd92aecdd0021ae887aa5e7ffddd3