Device tree cleanup

Change-Id: I2b37e1b27cbab6844991681baf13fcb5c76f6228
Merge remote-tracking branch 'cm/cm-11.0' into HEAD