Changes to support Samsung Devices