m8: Remove composition property

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