Bring back i9300

Change-Id: I187339a279654208d3ae6569e3829705fc759807