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