What the hell, partman?  I mean, what the hell?

Change-Id: I439b55218ab41d25a87a9066a6515273f0f49af6
Merge "What the hell, partman?  I mean, what the hell?" into production