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

Change-Id: Ib8791c45db6f6b3b7eb54d9faaa37ed972eae693