Aosp changes for Sony Nozomi