Merge "Make conversion functions non-inline" into pi-dev am: 1c57a0e6e0
am: fe2fd81387

Change-Id: I77a50464b1032a07b81e37d09ec921a8766e0699