Framework: Fix for latest 2 commits

Change-Id: I9966e07fc81da84f1948dc4a27f0a52c9677cdb8