[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 Change-Id: I251795a9c72e4b6bf9ac74df1ed80edd98ec9f4b