Merge "DO NOT MERGE Prevent stack overflow in btif_storage" into oc-dev