Reconcile moto props with Muppets

Change-Id: I4e5e094f3e912dd95b1e422139747dad6f2f4173