Tracking jellybam 6.1.0

Change-Id: I5f0f750151edcf8645834ee4e87881ee542321a5