[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244 am: 525aee59 am: 6a0ef37a skipped: 4dfb4289 am: 2503636b Change-Id: I4ae296df5e8019bfb178c1c61d8eec2cac61200b