moto-x: swap hijacks

Change-Id: If345a667b0813c32f05b0f45b0fe4ad42c4b5b86