Updates from themuppets

Change-Id: I75ed6c2d4f52761228dfd06f9a9c26c820b65f62