Merge "Fix bubble tests am: 99b363fb18
am: 8c5d6b6d5f" into rvc-d1-dev-plus-aosp am: e994133351
am: 44c2169ca8
Change-Id: I74361489e59dc210a7343050847c7bc7d56b5ddf
This commit is contained in: