Squashed reconciliation with Ms. Piggy and Kermit

Change-Id: Ifa10e79dc43012cefa1374c290488cd7fdd23afc