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

Change-Id: I37482f133909015781990bdd5a1e8817b0330a4b