Add support for i9305 + cleanup

Change-Id: I6021bb32fb30fd656bb08173780ed308f0bcb43f