Track cm 11.0 branch
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>