Merge "Merge "Don't crash if we've already been educated about Bubbles." into rvc-dev am: 907e00b2 am: 27a183b4 am: d1a1de03" into rvc-qpr-dev-plus-aosp