framework: merge fix

Change-Id: I10df993ea634c530afa3a675e8a07b3e545d2051