[automerger] DO NOT MERGE Fix a wrong check in rfc_parse_data am: 4cea9389 am: 220ef97d am: 78f26ef5 Change-Id: I7b018c136700d25e8a4905d0245d802979ea8c78