BUG: 356222570 Test: local test Flag: EXEMPT minor bug fix Change-Id: I1485aa78eb1323eefabf1eb023e24459faed51a6