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

Change-Id: I277bec761182cdabb14f92b623d969f6b763f27c