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

Change-Id: Iad102434f85ddf68f5d2a67796bb4adc472bebf2