Test: m bug: 80004139 (cherry picked from commit fd132876) Change-Id: If6ab6cbe6cd878f967c6d55a1bae45cbd23edaa7