Merge "Update test assertion after R8-D8 update" into tm-dev