props: clean up blobs

Change-Id: I8fa0edbb4a05ec2185ccd9443cd7dce43cb451bd
Merge branch 'cm' into HEAD