[automerger skipped] [automerger] [DO NOT MERGE]Prevent OOB write in Mfc_Transceive am: edda944f0d am: cd8c2d4de4 am: 4cf9865452 am: a84f27a5ea skipped: 80d0e47163 am: 5fb80fb271 -s ours
am: 90d51de79b -s ours
am skip reason: change_id I3e1977514ba924655d42be4782244c6ef1cf7619 with SHA1 1752091146 is in history

Change-Id: I7427c6ba869299f71746b9393e66f3330077fd0e