Multiple commits

Thanks to 95A31 (https://github.com/AndroidOpenSourceXperia/android_device_sony_kumquat/commit/c4d5a3e086b506349e1536e4163d20d036eaa704)