More hybrid value changes
Merge branch 'jellybean' of https://github.com/XYAOSP/vendor_aosp into jellybean