Updated for NEAK Note2 2.1x and S3 3.2x