Fix a sometimes integrity error
Fixing nits in code to unclutter my patch
Changed device types to platforms and form factors

Bugs 969242, 969243, 978150, 978160, 978210