Fixes: 77294673 Test: ensure attached bug is fixed Change-Id: I425dcb6a8c6f598cf295b155017b4c5f519394f1 (cherry picked from commit 04226362)