Frameworks: Merge a lot of improvements from VANIR

Change-Id: If97f0f70459483b6c46c65b4b2159c5d0d1d8547