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

Change-Id: Idd99269fb2f2ee5bacd7e71591b18f51bba1fd2d