Update to be inline with TheMuppets

Change-Id: Ia0707254a7ad4b6edafd4aac9bfef859519d1bb0