Sync up with TheMuppets.

Change-Id: Ic7e4b42b50e6780f33fee6fe3aaae24579fa40cd