framework: fix merge

Change-Id: I75caf7a61b33c84591dfda2a38b6a4cc11f22a73