Merge "Workaround b/16818336 which fails build under aggressive inlining." into lmp-dev