Merge evervolv changes for Kitkat