bug: 77513322 Test: m (cherry picked from commit 242758af) Change-Id: Ifd9bed0819541ea88fc5363b5c7c2726972456ed