Merge "Update test and dependencies after boot image changes."