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