[automerger skipped] Merge "Fix possible issue with cfi_basic test." into rvc-dev am: 79cd1b6f80 -s ours am: 84f6be6fa7 -s ours

am skip reason: Change-Id Iff45bd950d2eb33ff56dc700a2d739b5b578e090 with SHA-1 a3b70fac95 is in history

Change-Id: I014697daa539d28265eaef28ab46b7ebec25621b