Bug: 79324611 Test: manually tested on marlin_svelte Change-Id: Ic7fbf86d7c295cb6b2f20e7f9a957d1ed74c42c0