Track some cm-11.0 branches until cm-12.0 staging is complete

Change-Id: I36eaff999c8ce7de27ed527abdd0ee1a29ffe8ba