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

Change-Id: I71886bd5b0df497190ab6bd38f377c3a71053ba2