Sync From D951

Sync D951 to L7 Master Branch
Revert "Sync From D951"

This reverts commit de46110862e7f8708dcc7294d3083d38145a2ec4.
Sync D951 from L7 Master

Making L7 D951 in my fork inorder to commit to it and make a pull
request.