Sync with TheMuppets

Change-Id: I62550d62600aada4ccccc08bd6edea34bc1ac612