Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev