Make these non-inline.

Change-Id: I0de443a78e3024c7d3834f964a92f5ccdabe3cc3