Update to be inline with TheMuppets

Change-Id: I63f4116cd8eb27e6f736f1b5b1a2d9f291552b01