Fixes: 189299364 Change-Id: I45992045a42afca85cb25223a52d6b6cfca0085c Test: cert/run Tag: #gd-cleanup