Merge "Update framework assets for switches." into jb-dev