Merge "Gradually increase the level of authentication on failed GATT operations." into cw-f-dev