Initial aosp-4.2 changes