Merge "tests: handle legacy and new bootstat complete" am: 09b9fc56a2

Change-Id: Ic453aba0c23499188702a7785e0b5c54e7e85986