Remove moto/shamu no-op.

Change-Id: If2527de910f2d15a71882a8a3cf1afb47c5a899d