Merge "Disable bubble experiment; use shortcut info from ranking" into rvc-dev...
Merge "Disable bubble experiment; use shortcut info from ranking" into rvc-dev am: b839af1f am: e9d75850 am: ce5227f3
Change-Id: If2bddfc4003ebc01786639fab091de6e833a2765