Reconcile t0lte props with the Muppets for jb43/10.2

Change-Id: I263b4b6c4d84e853749d57e57ec55d7a0698cc73