Upbring to Muppets

Change-Id: Ib4aa76653e304ad08ddaadaa8369a7246f0aa38d
Merge "Upbring to Muppets" into jb4.2