COMP: Fix "unused-local-typedefs" warnings

Change-Id: I2571cc41e353003a22fd48fd4dc96eb2f59dc1c3
COMP: Backport double conversion fix for "unused-local-typedefs" warning

Change-Id: Iae5a76fe4e5f828a396d836ccda2dd8188b77162