Merge "Bubble v2 accessibility."
am: 467149161c

Change-Id: Idc822242ec6040e8fb39fb826518f15d672ec387