Partial import of Samsung OSS changes from ApexQ jellybean kernel