Fixes: 78285926 Test: manual Change-Id: Ifeb2610f5422d4b7376b61f99a48428e35cd0280 (cherry picked from commit 4748cf11)