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

Change-Id: I90bdb8c93b24eb3bfb72d1897223d8ed29e1258f