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

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

Change-Id: I46cbca91f21eae8d24d9b112a6b4612bffcf6531