Merge "Implementation of 16-bit conversion."
am: d990e29581

Change-Id: Ic52939adf1edc836c0c96c52f83053268812c94e