sync with percy #2
sync with percy #2

Legacy-Xperia/android_device_sony_kumquat,Legacy-Xperia/android_device_sony_kumquat,Legacy-Xperia/android_device_sony_kumquat,Legacy-Xperia/android_device_sony_kumquat,Legacy-Xperia/android_device_sony_kumquat,Legacy-Xperia/android_device_sony_kumquat