framework: fix merge

Change-Id: I5812c154271cd86195c0b7e0609e96eb0e1426ff