[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be9 am: b26970f1 am: f951aec9 am: 0d931247 Change-Id: I881f729bd844988a39bf561b870cbdca9c6d45df