getting in line with aosp 4.2/cm10.1 required changes