[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244 am: 525aee59 am: 6a0ef37a skipped: 4dfb4289 am: 2503636b am: 27d3295d am: c3deead2 am: bbba8d8d skipped: e294ca0a Change-Id: I97a4460e30f040e3500cdc495d2d0fe9960e46dd