[automerger skipped] [DO NOT MERGE]Prevent OOB Read in Mfc_Transceive am: 73089af2 am: ee7a1aa4 am: b6c2bacb -s ours am: 3cb5f875 -s ours am skip reason: subject contains skip directive Change-Id: I165fc104a6f90cec0d611c0c54ab9e7ef3ff4098