i9300: Pull from Team-OctOS remote

Change-Id: I4e911fcf131bf79fee2fb68b70733fdd0384913f