Merge pull request #4301 from ciband:feat/qn9090

PiperOrigin-RevId: 543523833
Change-Id: I602373a321e2b8080264e3f418ef5b2254f615fb