Merge "Fix possible issue with cfi_basic test." into rvc-dev am: 79cd1b6f80 am: 447735203c

Change-Id: I5304d0f63b1e492e597dfc81fbfaa3c40e3a32f0