Fixing conflicts to merge to cm10.1 from upstream