Show Sprint some love for once

Conflicts:
	init/init_m8.c

Change-Id: If8d9a5ebf56fb2fd958294ad86ee6b8111738bcf