Maguro and fixing products

Change-Id: I0876f77b670e4ab1c4f18eb7221d032919158fff
Added back i9300

Change-Id: I378e9184e215e4104842652f7f1db01ad4446ada