Merge "Fixing sffakehwc_test"