Merge "Make inlines static" am: 68c5ce22fb
am: 4834824a37

Change-Id: I508d68ff366f3deefa02f0cbb58e585ef8e3f9a9