Sync Upstream Cm 11.0