[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during...

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 435deba1 skipped: f5307535 skipped: 348c5cc7 skipped: c30e8e3d skipped: 9d0cbc63 am: a44b3d59  -s ours am: ab900655  -s ours am: 83014ffa  -s ours am: 62d90eef  -s ours
am: 967c78da  -s ours

Change-Id: Ib603c96ddadbc6c5cd78affc7195f6365fd8d081