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

Change-Id: I6dfea2239b18eadea33c5b5e9e021df38288c8c5