[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am: 525aee59af am: 6a0ef37a82

Change-Id: I718febf1f78b104c9e122a75dd9e5f94e53637a3