rebase from @KangXperiaProject so inline kernel is stable