Fixes: 78090775 Test: ensure attached bug not reproduces Change-Id: I386087742883e4847d811f7b8e6e7c8c8aea227a