Follow our own i9300 and i9305

Change-Id: Ia374b35cfa8002921bbb298b9d50512f8a36bb32