Merge "Make inlines static" am: e338b979f9  -s ours am: 9c99a1cf3c  -s ours
am: f8ae91e368  -s ours

Change-Id: I9500c90890e0ef29100cf2c976ddba851285d0aa