All HTC One S related changes reverted due to applyProperties problems on other devices. Libraries rebuilt.
(cherry picked from commit 8104164c)