Merge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 89a18a04 am: d15ee07e
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 89a18a04
DO NOT MERGE Prevent stack overflow in btif_storage