Fixing conflicts part 2 to merge to cm10.1 from upstream