Initial backport of i9300