Fixes: 347373574 Flag: EXEMPT bugfix Test: manual test Change-Id: Ia1333474059988a524fc0ca49e7062b51da2cc37