Clean up and remove discard
Clean up and remove discard
moonlightly/android_device_sony_huashan,moonlightly/android_device_sony_huashan,moonlightly/android_device_sony_huashan,moonlightly/android_device_sony_huashan