Overhaul for jellybean

Change-Id: If6a6b0afe462bcc805100065624965d2ffa9b349