Update framework

I have check all and can be merge into aospal source for me !