Make these non inline.

Change-Id: Ib139850380b039382565e3de3666eebb5750f32d