Merge "Mark two inline functions as static"
am: 624825bb2e

Change-Id: Ia8fce09454ffae7fa8f994e84ebfe45992c2242e