Bug: 111948805 Bug: 113119760 Test: mm Change-Id: Ic8f16145102eb23b958d53ce845cc0a85a775365 (cherry picked from commit 43cb00ce)