[automerger skipped] DO NOT MERGE Add support for EFF/RTR to canhalsend am:...
[automerger skipped] DO NOT MERGE Add support for EFF/RTR to canhalsend am: 62bbf3dc am: 977e2eed -s ours
am skip reason: Change-Id I330b9d24c34918b38612ddc1745f019e11bfd474 with SHA-1 62bbf3dc is in history
Change-Id: I14e6f5f86fc4d36f0e0b51473341bc176f94e0e9