Bug: 75020967 Test: mm Change-Id: I7ff941dc4ca9e29b9b045ecbc881165828945bd0 (cherry picked from commit ab5f4d72)