Bug: T362829 Change-Id: Ia7c88b3fa51f0a6c515897c535b9969587db81d2 (cherry picked from commit 54b81d8fae2b43cbde5d04bd72d038c4879a3455)