Merge "Bubble v2 accessibility." am: 467149161c
am: eb2a03414d

Change-Id: Ib4482e775776f8fef5b8c6f415bc6ba543311793