[automerger skipped] [DO NOT MERGE]Prevent OOB Read in Mfc_Transceive am: 73089af204 am: ee7a1aa4bc
am: b6c2bacb47 -s ours
am skip reason: subject contains skip directive

Change-Id: If76d106ca01c37361fa47dd5a69a74d7c8bfe713