Backport overlay bug fixes (Android PR 3691 3623)#6274

Merged

ehsannas merged 3 commits intofirestore-overlaysfrom

ehsann/backport-3691-3623

May 18, 2022

Commits on May 13, 2022

Commits on May 17, 2022

address feedback and add missing tests.
ehsannas
committed